Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Sun, 28 Mar 2010 13:04:11 +0000 (09:04 -0400)
committerEli Zaretskii <eliz@gnu.org>
Sun, 28 Mar 2010 13:04:11 +0000 (09:04 -0400)
commite752a484ed41a23d5928a86af0b2bcc9a39724ed
treeaeb19fb7a737ab2ccb0c6ab7f750d062ab73957b
parentcbba3ce0b53ed873d27cef57e34692779a16c94b
parentc34d3e2f0f4cfdbf5e18d4628c5f226305400a9a
Merge from mainline.
src/Makefile.in
src/dispextern.h